Closes #62: removed obvious peformance killers