[FIX] Remove extraneous files
[FIX] Clean up code