- Remove support for PNG (partial)
	- Code clean up

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>