cleanup and bower inclusion