Code cleanup. Deleted unnecessary code