Cleanups (deprecated code, unused imports)

Just some minor cleanups and removed some unused imports.