Improvements and removed unuseful objects