Clean up unneeded items from initial commit