removed unneeded 'enabled' checks and some minor cleanups