removed unused modules and directories plus minor corrections

@synhershko