Cleanup and added new start triggers