Clean up, final commit