Clean up build a bit

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>