-Fixed build
-Removed unused code