Removed test data and data binding