Finished removing un-needed components