Prototyping clean-up