Removed un-used code and imports