Cleanup

Removed all stuff that is not needed or is unnecessary and should be in sole discretion of using developer.