Latest updates from dev server
Removed subrpoject junk