Commented out code should be deleted I guess