Removed pointless function and rearranged placement code.