Slight margin adjustment

Signed-off-by: John Rayes <live627@gmail.com>
Unused class (SMF 1 leftover...?)

Signed-off-by: John Rayes <live627@gmail.com>