Commented out unused stuff. Might soon be deleted