Removing advanced optimisations for now