clan up deadspace and unnecessary comments