Removed some code to make it ready