Cleanup fpl imports