Removing old and unused method