Removed dependancy on devusr module