Initial fixes
Removed old code & sample files