Initial checkin and cleanup