Removed unnecessary code for testing purpose