Removed more redundent or outdated code