Cleaned up unused submodules contd