Unused code removed, mobile fix moved to its own module