Removed adminq80's messy code
Removed the good code
Merge branch 'adminq80-mess' into dev