Removed needless submodules
Updated from master branch