Cleaned unnecessary code