Removed some code that no longer makes sense