Finished removing stuff which shouldn't be here