fps: cleanups, and remove unused code