cleanup and fix bower