Cleaned up outcommented trash