Clean up (fixes #16) and prod build