Did some cleanup

Did some cleanup