Removed unused code and dependency on Ext library