Cleaned up excess in main