Technical cleanup