Remove temp stuff; make it presentable