Still need to remove these because they will slow Andy down...