removed unneeded files and cleaned up code a little