Code improvements (+ removed code for PocketPC)