Final changes. Removed unnecessary code.