Removed More Unnecessary Code