API 19 and clean up

Signed-off-by: Grarak <williye97@gmail.com>