Removed unwanted controls for the POC