Removed some unused junk and the problem causing statusline