Removed Bourbon completely and made Neat stand-alone