Removed unused module and cleanup