before merging we have to clean up commented out code. either its irrelevant and can be deleted, or it should be used.