Remove stuff I am not using anymore