Cleaned up startup