removed some commented stuff which probably won't be used again

also, commit 16 for the day