Started some cleanup