Final code commit after cleanup