Few abstraction ammendments, and removal of unused imports.