Removed unnecessary files.
Merge branch 'spring' into development