cleaned the code a bit(deleted unnecessary methods, attributes and source files)