removed test files that are no longer needed
cleaned up the code a bit