Cleaned up prototypes