remove stupid code optimisations