Removed code to be added in demo