Removed redundant or unused code