Clean-ups based on code review

- Remove seemingly arbitrary @inline annotations
- Remove unneeded imports