FIX: Remove cruft