Disable mass storage support
This is 2014. And this is brooooken
General cleanup