Removing temporary code added for #5