Checkin current state
Trying cleanup