Remove generic stuff