Removed olf code