Removed obsolete modules and references