Removed some old (not used) modules from project