Cleanup after sync

Cleaned up the build path in eclipse and resolved some compilation
errors