Added some functionality and removed deprecated files