Deleting debugging code and date related code which is no longer needed