Removed obsolete code (modularised)