Removed smarty-pants due to a bug