Removed unnecessary pieces of code from project to make it better.