Dev

Some cleanup for your dev branch