Removed AngularJS for future implementation