removed unused modules and directories plus minor corrections

@synhershko 
This can (and should) be completely removed