Removed more of Joshua's trash