Comment out macaron related stuff in order to work