Removed unnecessary (?) code