Code clean up. Remove some unnecessary files