Removing unnecessary code. Relates to #94.