Removed small amounts of unuseful code.