Cleaning up… lots of stuff :expressionless: