Cleaned up unused sections