Final Commit - clean up