Fixed dependencies and cleanup.