Cleaning up old Dev stuff