Removed older modules and unused methods.