some cleanups in regards to requirements