did some cleanup

……..only proper commits here on out..