Code removal

Just removing stuff that wasn't needed.