Initial Commit after clean-up.